Preserve heredoc body when translating multi-line T.let assertions#943
Open
styrmis wants to merge 1 commit into
Open
Preserve heredoc body when translating multi-line T.let assertions#943styrmis wants to merge 1 commit into
T.let assertions#943styrmis wants to merge 1 commit into
Conversation
styrmis
force-pushed
the
06-08-fix-spoom-heredoc-handling
branch
3 times, most recently
from
3bd034d to
3c92653
Compare
When `T.let(...)` spans multiple lines and wraps a heredoc, the replacement range covers the entire call including the heredoc body. Since the value node's source range only covers the opener line (e.g. `<<~MSG.strip`), the body and terminator were silently dropped, producing syntactically broken Ruby.
styrmis
force-pushed
the
06-08-fix-spoom-heredoc-handling
branch
from
3c92653 to
a5d6263
Compare
KaanOzkan
reviewed
Jun 9, 2026
|
|
||
| value_end = node.location.end_offset | ||
| opener_line_end = value_end | ||
| opener_line_end += 1 while opener_line_end < @ruby_bytes.size && @ruby_bytes[opener_line_end] != LINE_BREAK |
Contributor
There was a problem hiding this comment.
You can use
| end | ||
|
|
||
| #: (Prism::Node) -> Integer? | ||
| def find_heredoc_end_offset(node) |
Contributor
There was a problem hiding this comment.
If we have something like
both = T.let(
foo(<<~A, <<~B),
first
A
second
B
String,
)stopping at the first heredoc would end up dropping subsequent ones. I think we can support this case too.
Something like
#: (Prism::Node) -> Array[Integer]
def heredoc_end_offsets(node)
offsets = [] #: Array[Integer]
case node
when Prism::StringNode, Prism::InterpolatedStringNode
opening = node.opening_loc
closing = node.closing_loc
if opening && closing && opening.start_line != closing.start_line
offsets << closing.end_offset
end
end
node.each_child_node do |child|
offsets.concat(heredoc_end_offsets(child))
end
offsets
endUsing each_child_node should take care of it for us. And then inside heredoc_body_within_range we can do
heredoc_end = heredoc_end_offsets(node)
.select { |offset| offset <= replace_end_offset }
.max
return unless heredoc_end
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When
T.let(...)spans multiple lines and wraps a heredoc, the replacement range covers the entire call including the heredoc body. Since the value node's source range only covers the opener line (e.g.<<~MSG.strip), the body and terminator were silently dropped, producing syntactically broken Ruby.